From 968ac90e89f444e180d883a28bfd260b118f451d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 12 Aug 2015 14:39:46 -0700 Subject: [PATCH] Revert "Revert "window: fix initial shadow width for maximized/fullscreen windows"" This reverts commit 8b695cc7279270eabf7d2541cfd592608d0add38. No reason in the commit message was given for the revert, and we need this for proper behavior on map. --- gtk/gtkwindow.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 4e96d6f712..a0b8f126f6 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6099,6 +6099,8 @@ gtk_window_map (GtkWidget *widget) else gdk_window_unmaximize (gdk_window); + priv->maximize_initially = FALSE; + if (priv->stick_initially) gdk_window_stick (gdk_window); else @@ -6120,6 +6122,8 @@ gtk_window_map (GtkWidget *widget) else gdk_window_unfullscreen (gdk_window); + priv->fullscreen_initially = FALSE; + gdk_window_set_keep_above (gdk_window, priv->above_initially); gdk_window_set_keep_below (gdk_window, priv->below_initially); @@ -6592,7 +6596,9 @@ get_shadow_width (GtkWidget *widget, return; if (priv->maximized || - priv->fullscreen) + priv->maximize_initially || + priv->fullscreen || + priv->fullscreen_initially) return; if (!gtk_widget_is_toplevel (widget)) -- 2.30.2